Merge "Snap for 11878398 from ff28f389114ac5402adb8132348590b312d35d99 to busytown-mac-infra-release" into busytown-mac-infra-release