Merge "Snap for 5622519 from 2062c5a408eb44ead19b7e2e797e93b5781ae931 to pi-platform-release am: 6431a9bc8f" into pie-cuttlefish-testing