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