Merge "Tests and docs updates for OkHttp update."