Snap for 4706961 from 42393395be4cf94d0a0030fb22f9ec38fabf842e to pi-release

Change-Id: I072b40f64bc73286eec7c3d0d5907ad81a653b20