am bd0962c2: Merge "logcat: timed tests fail under load"

* commit 'bd0962c2d390d87d336f21d1862dcb01b84d1a82':
  logcat: timed tests fail under load