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

Change-Id: Ie8b8162010e6e04e6363fe1bf3186a004a95fc06