am 7fdfe28c: am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev

* commit '7fdfe28c75e103b8a66b559dcb813576fbbf2eb5':
  Fix for the invalid Global Proxy Setting