Merge "Snap for 5524043 from 6c72374eeaf99e2b9db1c8cb5c9f945311317a1c to pi-platform-release am: 87820b2475" into pie-cuttlefish-testing