Merge "Minor changes for DnsResolverTest" am: e445f54934
am: c8ecc806ad

Change-Id: I3b9eab390a476805eca35c5ae49d6516465f2699
tree: 207c1f6947a04cdf4c92a5c2ec00311bd13c7892
  1. tests/