Merge "Refine the proto dns_resolver.proto" am: 257719b2d5
am: 0592abbce1

Change-Id: I542ab5e79429ba1134dd3c75f6f6ff6fe8bd1705