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

Change-Id: I1d6084255ee59ff55f8a91196852f3645c3fe281