Snap for 4560043 from 5a5fea16d9f36fec04588f11c952136a89c0afe4 to pi-release

Change-Id: If05eb445cc6adf5b1d200ed87c54d8c638fdff9c