Merge "Snap for 5622519 from 48c9a1224b294bb96d2bbf83fe307ae8f61b05e4 to pi-platform-release am: 9628cbc9ee" into pie-cuttlefish-testing