Snap for 4620899 from 0f64cc38e2a2c4d7cc020a6821f4956b333ad62c to pi-release

Change-Id: I127592bd7aa30964916fe624e9a46e1811e85f4d