Merge "DO NOT MERGE IP connectivity metrics: fix tests." am: b2adaad26b -s ours am: f294973f6c -s ours
am: dde60ac16d -s ours
Change-Id: Ib31248616d75fdb30f2230d8fed0ee577a71d116
This commit is contained in: