Merge "Snap for 5240760 from 20ac1203a3201ac3e6d05a19325f5569033f3d08 to pi-platform-release am: 5d1d32dcbf" into pie-cuttlefish-testing