Merge "Introduced timeout to post method of HttpClient"