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