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

Change-Id: If1b31005aac6c1509e78db11d75fbfda00e6f3bc