Merge "Snap for 5450365 from a109f5245ee84b2f98393f2b0a292058e11accc5 to pi-platform-release am: 46c8171312" into pie-gsi