Snap for 4535700 from f378cb36e45cbfd402a26982a284dbd2933d5ef8 to pi-release

Change-Id: I956168686270e297ae43480a4f722498ddc7bd33