Merge "Pull upstream fixes from OkHttp"