Merge "Fix NetworkMonitor won't do private dns resolution" am: 3c5b0fd9db
am: cacb33bbe9

Change-Id: I5ec0cb096f2704e21e0c0f296d5cf81ab8808627
tree: 9e78221dc12ae96a752256e642d4c9a98389d727
  1. core/
  2. services/
  3. tests/