Merge "Snap for 5180536 from 881b90ab9fcc3a43995b5fa91689ed94eaaf2d59 to pi-platform-release am: 4b99eacbdc" into pie-cuttlefish-testing