Merge "DO NOT MERGE IP connectivity metrics: fix tests." am: b2adaad2 -s ours am: f294973f -s ours am: dde60ac1 -s ours Change-Id: Ib31248616d75fdb30f2230d8fed0ee577a71d116