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