Merge "Revert "TEMPORARY HACK: strace and fail on some timeout""
am: e5fa447366

Change-Id: Id7863b191f8ccbbc8d78fcddbd742d5197721c76