Merge "Snap for 5450365 from 241ec2b9f34cf997620297c978bdd66723863984 to pi-platform-release am: 414c5a7d5f" into pie-gsi