am 2a1fb433: am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev am: 8fa42e3cfb

Original change: undetermined

Change-Id: I3c3a1a9975716b59183e9ba5aeea059e4514c3ac