Snap for 5622519 from 81b3f635622cda59f93cc13edf0621da064bc072 to pi-platform-release

Change-Id: I2fa7ee95d121ad53fd5e3cc445b83fbeb7bb2d66