Merge "Snap for 5674421 from 10308535f891cc57e1cffba1f67266f183a2b579 to pi-platform-release am: 40b476c579" into pie-cuttlefish-testing