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

Change-Id: Iea4fcc93ec15a4680bb27f3a51cb896d27513722