Snap for 4523885 from 0a10ff5d43dd8047631d6e7cdbadc4af70990268 to pi-release

Change-Id: I6fc6b26de3852fe9e870e214694e45c212c08dfd