Snap for 4620899 from a1ba90df6372d7194fcb2fa59d69f0d53b2141a6 to pi-release

Change-Id: I87553e246ef424427c13761a33d2ecb7da2fcf10