Snap for 4773106 from 18bb5326fef0a3d62fce1864e4776baba420bec0 to pi-release

Change-Id: I381a24cf2b0eceda57e76943e46db92a4988d652