Merge "Snap for 5450365 from 6865b120c3f10e086a468ae4b8b3902caeb6f290 to pi-platform-release am: a8574a28e3" into pie-cuttlefish-testing