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