Merge "Fix HttpAuthHandler for synchronous requests"