Merge "Fix NetworkMonitor won't do private dns resolution" am: e121a329b8 am: 39810500f0
am: 266e2c5ac2

Change-Id: I2785e0aedd229aba6c1d8e8df09ee5c7a209b74c
tree: 09c3384f9adf7b1dfabf5fe516193ac0a4e0dce3
  1. core/
  2. services/
  3. tests/