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