Snap for 4693621 from a2c5a111c6e927fa9cc0b4db8f90259f16aad57b to pi-release

Change-Id: I04312f4b9197073273b1c1108625a3b3581022dc