This reverts commit 4e7077d7. Bug: 28845097 Reason for revert: ThreadStress flakes. Change-Id: Ibe29c2f679a642ccffea51c2fcf7dfaaed2dc305