Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev