am 79999801: Merge "Fix URLConnectionTest after latest okhttp update."

* commit '799998013b609bbce50cac6a887a6be2ba453bd1':
  Fix URLConnectionTest after latest okhttp update.