Snap for 4653471 from 056967eb7e08d2c22f99aea52f871c2d018a373b to pi-release

Change-Id: Ic945bb12c9a80c766ffb2c5c01d6894e92276506