am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev am: 215018f6e2

Original change: undetermined

Change-Id: I9b570cddaa33b95b0f2ba6ab953164cd73de34bc