Merge "Snap for 13206524 from 6bf502013ebedf40c4eb96bd2ee89a0d27f5e59e to busytown-mac-infra-release" into busytown-mac-infra-release