Merge "Snap for 12787546 from 2a1ada47ad219c31bd454d02fb953d6a0718185d to busytown-mac-infra-release" into busytown-mac-infra-release