Merge "Snap for 5450365 from fff27838050900ba7f4a9ed3c6e4adff9c9cb6cc to pi-platform-release am: 5e09aec115" into pie-gsi