Cherry pick fixes for OkHttp 2.1.0.