Snap for 4773106 from 534cf9df97786dce7f7ec7687716723f83ed1c1e to pi-release

Change-Id: Iea5e32f4b582c40a796f8f11ee6911fc6b3a4ce3