Merge "Snap for 5240760 from 988624eda2c566551f75b48231cdeff2b0142d93 to pi-platform-release am: 33e0de46b6" into pie-gsi