Merge "Snap for 5180536 from 1318d30f175f3842cbbbe93849df28a2fc1831a4 to pi-platform-release am: bbbbd3139a" into pie-gsi