Merge "Refactor based on new NetworkMonitor"