Merge "Snap for 5450365 from 251e7f201e843bba557375e696fb98443a1d2696 to pi-platform-release am: 9023a72fad" into pie-cuttlefish-testing