Merge "Snap for 5450365 from e6ef013d2c8c1201540128d9961b73450257ab90 to pi-platform-release am: 50e44460e7" into pie-cuttlefish-testing