Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev