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