Merge "Snap for 5524043 from 104ff01147e723070b36f4c19ab444f221638ce6 to pi-platform-release am: a0db83ccc8" into pie-cuttlefish-testing