Merge \\"Add thread suspend stress\\" am: 9969153d38
am: 3f5bb4c42b

Change-Id: I9ed24ebf7c3b92776fcc46392a57c89ce4e5dbf5