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

Change-Id: I3b2845bee8438a2eaae51c7856486a2d947f30f1
tree: 3f83465edb82ccaae4ac73828745bc0e8711c607
  1. tests/