Merge "Snap for 5180536 from cddcc0d9cf7cbba53e54d67455737a3900ae5d9f to pi-platform-release am: ba36715afc" into pie-cuttlefish-testing