Merge "Snap for 5622519 from 94282f76904cfc1b95be1b218f92b0f6c4191d8a to pi-platform-release am: 0b2e942cce" into pie-gsi