Snap for 4590521 from 55a66da31b332a613c8e5bce1de5fd32120ee192 to pi-release

Change-Id: Ibbe7281901c4da6988475eec224ddac4c2cfdad1