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

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