Merge "Snap for 11819167 from 8c24c2c27db8e6031165fdc4353b413e66456e18 to busytown-mac-infra-release" into busytown-mac-infra-release