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

* commit '383419e363bfefec5af672c47fba492312d61cd7':
  Changes associated with an OkHttp bad proxy response fix