Merge "Snap for 11819167 from 4f77a79ea0e5839302c2916ecba3fbf703cd1cc6 to busytown-mac-infra-release" into busytown-mac-infra-release