Merge "Refine the proto dns_resolver.proto"