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