Merge "Snap for 5310204 from 1b1681a8b0a3f95062c8f6f7fe31890629264e37 to pi-platform-release am: a104dea550" into pie-gsi