Merge "Snap for 5180536 from 38db7cf10596b743cf0c5e0c67809e384190f4e6 to pi-platform-release am: 37919f4f6f" into pie-gsi