Merge "Update httpclient and dependencies"