This reverts commit 13f4d963. Reason for revert: Fixing ThreadStress timeouts. Change-Id: I9f8c3f56eccfadc3751049731e8d427873cc7841