Merge "Fix a flake in ConnectivityDiagnostics"