Merge "Fix NetworkMonitor won't do private dns resolution"