Merge "Snap for 5674421 from ae0c2eeba3f60c62f63ec83b63d9c0593a0430fe to pi-platform-release am: 823838e9ef" into pie-cuttlefish-testing