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

Change-Id: Iaf7abac6170d5818a263392731069d7bf021d981