Merge \"IpConnectivityMetrics: no metrics upload in tests\" into nyc-mr1-dev
am: 1b4bd22f41

Change-Id: Ie313d530bcb5afd4e5ad9a6cf66c501b9029cbea