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