Merge "Change thread suspend timeout to be fatal for non-debug" am: bb75449355
am: f3c9cef773

Change-Id: I9324890fffa81e3c5e5eaf8f623291a8bb4c9262