Merge "Snap for 5622519 from 21051427fb1d1185244c5d297132c71525efe4fc to pi-platform-release am: bbccd3599d" into pie-gsi