Merge "Snap for 5180536 from 1f81bc85ba6733b0c72980aeab301de5b382b97e to pi-platform-release am: 63b8888f5a" into pie-gsi