Merge "Snap for 5450365 from 2a21bea448c56d892cf7c726771889ff2299f4d5 to pi-platform-release am: 7c2cd6a19a" into pie-gsi