Merge "Snap for 5674421 from 4a949c0640373471f5699c7a5cf490731394c574 to pi-platform-release am: 573db8a758" into pie-gsi