Merge "Minor changes and more cts tests for DnsResolver" am: db7e161d85 am: fc677b506c
am: 8432fdb074

Change-Id: I599ae429cc88f43c59985b6eecea5f728926ba57
tree: 090f804ae7dda93bf305d7888890dfefd8bd2d96
  1. tests/