Merge "Snap for 5450365 from 40113d035473d35c56cf62e9801ddaed8d7c16ac to pi-platform-release am: ab16b728a9" into pie-gsi