Merge "Fix parsing of global:http_proxy value." am: 36b169250b

Original change: undetermined

Change-Id: I09b7aa410c9d05d3b2688f08a5e4041d7e5a3c7c