Merge "Cts for DnsResolver" am: 1449fe3ba5
am: ec5579e054

Change-Id: Ifb1881048b61ed5be8efcd092a81105b82edbc4a