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