Snap for 4632767 from 7d3f5da415f0f6ae3d79565ec5422019e4b32d9c to pi-release

Change-Id: I4000cf9f867c56f452bc76fe447c4a07cd971bac