Merge "Snap for 5674421 from 4b1a883fc7fc198f73063bc49b710d1edd14918e to pi-platform-release am: e6ee2f7edc" into pie-cuttlefish-testing