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

Change-Id: I2076a5e82c7df65efb57ac1d93ec6557eee0f6af