Merge "Snap for 5450365 from a4ed762deb77813b750766933f2b1978293a7c94 to pi-platform-release am: 27f3544a41" into pie-cuttlefish-testing