Merge "Snap for 5524043 from e31b34fa0cd1e70d1105e2f472d400f6619b2913 to pi-platform-release am: 799a8ca54f" into pie-gsi