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

Change-Id: I5ec0cb096f2704e21e0c0f296d5cf81ab8808627