Merge "Snap for 11819167 from 6bace3f7c45448789d664245bb3dad06051f5b20 to busytown-mac-infra-release" into busytown-mac-infra-release