am e702d545: Merge "Rewrite calls to Proxy.getPreferredHttpHost"

* commit 'e702d54594f8bd9472732c0ee35cd6503862633e':
  Rewrite calls to Proxy.getPreferredHttpHost