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