Merge "Snap for 5450365 from 0b90ca261ab87149887550806e65161c400013d1 to pi-platform-release am: 49d7fcb76f" into pie-gsi