am 0787d3c9: am 2446b68f: Merge "Fix the DNS proxy again, for reals."

* commit '0787d3c93bd52d8799bc1fbc4848e56d669337f7':
  Fix the DNS proxy again, for reals.