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