Merge "Snap for 5180536 from 556b091a754cadd239102086bbcfa77e5afe6ba4 to pi-platform-release am: 20de0ce610" into pie-gsi