DO NOT MERGE Fix IP connectivity metrics tests am: 93c0de0a35
am: 6b480eca3f  -s ours

Change-Id: I5ccac93d3815a7ad967fa1494d6e48220beaf88b