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

Change-Id: Id731f73f25f437df94f936e9a3ec227b797b6031