Snap for 4713750 from 60d7315fb7ef4a03bf7dd13eaa729c884a52ce3c to pi-release

Change-Id: I730ea79e9b1e7f7c0ade8e30e507ad37697bdb2c