Merge "Snap for 5450365 from e9e9d8676e48327ed225bb41806ba468e1e46ed9 to pi-platform-release am: 86a28bd492" into pie-cuttlefish-testing