Merge "Refactor based on new NetworkMonitor"
tree: 681f338951411763f8f5c42541103b7c077a8758
  1. core/
  2. services/
  3. tests/