Merge "Improve test for the changing of DnsResolver"
am: fd3e15e0c5

Change-Id: I95d74116c9de67b8915343f45b26a011d0248faa