Snap for 4722539 from 7b0739a53a05ab65244c7e2c75d200b154f2efd1 to pi-release

Change-Id: Id2e789f1102b4b843b0b798dd610c0472c1e61ef