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

Change-Id: Ib56d09a34a56090312ece4924ca685c7b932faf8