am 5c8574a4: am 12985b2c: am 81ed04a6: Reduce flakiness of OkHttp tests

* commit '5c8574a4917038cba59f42cd6032ca14cb0dfa43':
  Reduce flakiness of OkHttp tests