Merge "Update URLConnectionTest due to OkHttp bugfix backport"