DO NOT MERGE Fix IP connectivity metrics tests
am: 93c0de0a35

Change-Id: Ia6a28b09263729caa72786062e134f8c684e3ccb