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

Change-Id: Iaa83e8914614fa874a88beb8821bb83e0dce5c09