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