Merge "ConnectivityMetricsLoggerTest" into nyc-mr1-dev
am: 3a6acc6d96

Change-Id: I94a70a84e1869573fa3222639538593fa681fcce