Snap for 4773106 from 0b4a16e46526c743775f9edaea0ddaf30c92b3da to pi-release

Change-Id: Ie7840a9edf2a2065b0f33dc195c4982b62e91ba7