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

Change-Id: I8c6ebabcbc535eb3004c4a5fe7033ab823734982