am 3b9244b4: Merge "Fix for the invalid Global Proxy Setting"

* commit '3b9244b4b4d5008daa9763a169a751975c75cc54':
  Fix for the invalid Global Proxy Setting