am 8426987b: Merge "Revert "Changes associated with an OkHttp bad proxy...
am 8426987b: Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev automerge: 34d183b4
* commit '8426987b':
Revert "Changes associated with an OkHttp bad proxy response fix"