Merge "Changes associated with an OkHttp bad proxy response fix" into lmp-sprout-dev