Merge "logcat: timed tests fail under load"