Merge "Snap for 5180536 from 838861c5f58bfd1750ec83354b7c01d3bc41ac74 to pi-platform-release am: 0cfea440d3" into pie-gsi