HTTPClient improvements

Change-Id: Ic9256ac255e0392634c90047363a6069f970e881