Merge "DO NOT MERGE IP connectivity metrics: fix tests."
am: b2adaad26b  -s ours

Change-Id: I47dbd0feaa99ff6018efc8703cfa29a265bc73fd