Merge "Snap for 5674421 from 4c7873cc30820d666084bafcd90c903e589fd6bb to pi-platform-release am: 9547564713" into pie-cuttlefish-testing