Merge "Revert "Change thread suspend timeout to be fatal for non-debug"" into oc-dev
am: 44bb88fe74

Change-Id: I744da760acaa4b369b161d06665e6f97684297f0