am 41efab55: Merge "Fix DNS proxy."

* commit '41efab55c8ca0344d5d68d0a3ab5b1b43f905e3b':
  Fix DNS proxy.