am fdaf90ab: Merge "Fixes associated with OkHttp fallback changes"

* commit 'fdaf90ab1738bb4c9368ff1628600b5a1a768860':
  Fixes associated with OkHttp fallback changes