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

Change-Id: I2785e0aedd229aba6c1d8e8df09ee5c7a209b74c