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

Change-Id: Ifefd65d42cdc5a1a2a28673a7b2d148e971e6089