Merge "Changes associated with an OkHttp upgrade"