Merge "Snap for 9680074 from 9b298decebebc088c2a33385efcd3f62705bca98 to busytown-mac-infra-release" into busytown-mac-infra-release