Snap for 4739962 from a23eb7fc4ae33c247d4cf0f36f09c88eb9024852 to pi-release

Change-Id: I91cb672c5889e1e44e93764fee4e211a0fa9794e