Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev

* changes:
  Add tests for MetricsLoggerService
  Tests for IpConnectivityMetricsLog