Snap for 4625912 from 4e7bb4e0e8486279a7fb1d6a3e9442c6c82e6146 to pi-release

Change-Id: I9761be7e10cde3c496989db89573a578d55668a6