Merge "Change dependency version for httpclient"