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