Merge "Snap for 5180536 from e2b71fbd1f36abac5a9fa55647083f54dc50d508 to pi-platform-release am: 867980edfc" into pie-gsi