Merge "Snap for 12787546 from ac0fe6c3635675c645ac2f754790cb5f04d82fbd to busytown-mac-infra-release" into busytown-mac-infra-release