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