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

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