am 00502e89: Merge "Changes associated with an OkHttp upgrade"

* commit '00502e89603fa460cfd29d8759d74e38946105d4':
  Changes associated with an OkHttp upgrade