Snap for 5622519 from e659dbcdf08d10c0ebd2d6c967078e13ae96736d to pi-platform-release

Change-Id: Idae8f436bcdbc2a616440dfb2c65d49842790dc2