Merge "Snap for 5674421 from 5b24ead12ce74791a53f47a4a588006fdfc33d80 to pi-platform-release am: 31674eb6cf" into pie-cuttlefish-testing