am 8cee7841: am 41efab55: Merge "Fix DNS proxy."

* commit '8cee7841d6aec9868dc94961e42277e332376f12':
  Fix DNS proxy.