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

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

Change-Id: I519e12bb2ef5edd4aef66eb28846b99e1f952157