Merge "Snap for 5450365 from 57fb22ac21d2aa8bdc65c6984567e04a93d27256 to pi-platform-release am: a10cb23d08" into pie-cuttlefish-testing