Merge "Clean up unit testing for ConnectivityDiagnostics."
tree: 65f706f24526bd0a026feef30d4ed81bd9e66b35
  1. core/
  2. services/
  3. tests/