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

Change-Id: I0c0e1e56b7fb465f143ed4fab72c4c2177d61bd5
tree: 8b1d532484933194b0ea9a57cc963e090511058f
  1. tests/