Merge "Snap for 5450365 from 1e05c7d11ef8431ac4042ba8a3bb6512752e3e4f to pi-platform-release am: 50d339ba77" into pie-cuttlefish-testing