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