Snap for 4745538 from c82cc185378f84d9aa51c7ab8c8dd3f104312b97 to pi-release

Change-Id: Id50fa79185b17b2699527a4fe45092b852c506f1