Merge "Refactor based on new NetworkMonitor"
am: 3ad444cb32

Change-Id: I6f2f42dee11b2ee3db9e52817cd7aa871539aaed
tree: 681f338951411763f8f5c42541103b7c077a8758
  1. core/
  2. services/
  3. tests/