Merge "Remove an unnecessary OkHttp dependency"