Merge "Snap for 5180536 from 01ba7e7dd6506c59bd25312c9e910424a20d113f to pi-platform-release am: f0d22e1f09" into pie-gsi