Snap for 4625912 from aa407aedefee09f75b143f2b15de050c0ef6ad3c to pi-release

Change-Id: I127e354bffa88b29d1f5203bb981c21793fb4c41