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

Change-Id: Id587c460e906fe629eb64b39b4c18f902738d6d6