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

* commit '433aabc707aa6761e9c5bdaa9d640cad04fe3b74':
  logcat: timed tests fail under load