Merge "Snap for 5450365 from 14fc0bb1ca92e132c826662847d2ee5cbe19d594 to pi-platform-release am: 385b1ce014" into pie-cuttlefish-testing