Merge "Snap for 12356763 from 91dda7543a4d1de33d47b70c788c47d81abff495 to busytown-mac-infra-release" into busytown-mac-infra-release