Snap for 4662252 from ae8d63ab1d7da7d96e5865a9a9ae2d5fcc8dbab8 to pi-release

Change-Id: I76ee6067a068d9f65e15efa690cf30dcac7e40db