Merge "Snap for 5180536 from 13b7f1c5fb212f5ecee575480229f70d7a7c8e61 to pi-platform-release am: abe54e81bc" into pie-cuttlefish-testing