Merge "ConnectivityMetricsLoggerTest" into nyc-mr1-dev