Merge "Revert "Change thread suspend timeout to be fatal for non-debug"" am: bd4e4f23ad
am: 5e00dba582

Change-Id: Iec0fdadd0439c5e6539ea2eb92cd14ae09873004