Merge "Snap for 5450365 from ca4391f77ff8f98868dee568ec2569f672397572 to pi-platform-release am: 36f8b59298" into pie-cuttlefish-testing