Merge "Snap for 5450365 from 447a5e4054d88da22014194705e94f3cc401170c to pi-platform-release am: f8fe5939a4" into pie-gsi