Merge "Fix NetworkMonitor won't do private dns resolution"
am: e121a329b8

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