Merge "Snap for 5180536 from 082e32effc07dddd06b67d2be2c2c6ee554d5d52 to pi-platform-release am: 57f40b33d9" into pie-gsi