Merge "Snap for 11819167 from 02ea8be0fdb23ca71533ddd1bf9930bddde49a69 to busytown-mac-infra-release" into busytown-mac-infra-release