Snap for 4620899 from 455bdd3ae707763d3b13a4fc1e6d91d781bc5ce1 to pi-release

Change-Id: I6b5e8752b3a9e413a863c2a73e73ecbf698a1544