Merge "Only log excessive timeouts if those appear accidental" am: 9f168cc
am: d92d9e0

* commit 'd92d9e0ce8e0a073cf049b576c1a1846f5b39761':
  Only log excessive timeouts if those appear accidental

Change-Id: I6deaaae08af8ea19eafa4456882a3413a778e3d8