DO NOT MERGE Fix IP connectivity metrics tests
am: 0ef1916103

Change-Id: Ia6a28b09263729caa72786062e134f8c684e3ccb
tree: eab43807b91d5f77d409c0ba20a3f7f64d116fae
  1. core/
  2. services/
  3. tests/