Merge "Snap for 5180536 from dd6c5546adc4715854182358c2dd68691434efe9 to pi-platform-release am: 722730b090" into pie-cuttlefish-testing