Merge "Replace interal okhttp APIs"