Merge "API council feedbacks for DnsResolver"
am: 5023a6184c

Change-Id: I5737cf293264bf9d492e7bd56b62bee4d49002eb