Merge "Fix ConnectivityDiagnosticsManagerTest for MTS"