Merge "Remove unnecessary OkHttp reference"