Snap for 4713750 from 6a7e107ad0c958687c4e80ef332f9ed999f50eb5 to pi-release

Change-Id: Ia908b79fc4728b751b6a3deb2f031eb8bbd43dec