Merge "Update okhttp to commit b48247968a."