Merge "Snap for 5450365 from c7ea85ad2734113008fc5409ec5c6be86c2ad2ee to pi-platform-release am: 90e96fe93e" into pie-cuttlefish-testing