Merge "IpConnectivityMetrics: no metrics upload in tests" into nyc-mr1-dev