Snap for 4793185 from 5529c6ea5fd4cb3959f11c9b4b114361a3db2f73 to pi-release

Change-Id: I47456554effe1068f80682084689061c93ea8147