Merge "Snap for 5180536 from 91873a4c1851268f0b7f86cc33bb3403fe24b2ad to pi-platform-release am: ac2c2c0eea" into pie-gsi