Merge "Snap for 5450365 from 3b24999395cbc0e018d6f23a3af0563ce6daefa9 to pi-platform-release am: 37fc0fe924" into pie-gsi