Snap for 4793706 from e99108bcd9711fb8196b283fd259df92c36c1145 to pi-release

Change-Id: I324e967dfdcd183925b4c1a6a2754f0d2cd0ed90