Merge "Snap for 5180536 from 9ec7ba8443caa905c2ebdf6eadd5e6148a348d37 to pi-platform-release am: 971f83995e" into pie-cuttlefish-testing