Merge "Revert "TEMPORARY HACK: strace and fail on some timeout"" am: e5fa447366 am: 10629c6202
am: 6fd54366d2

Change-Id: I10bbf0febed2fc717ae78ab74633f6ae9d16fec0