This reverts commit 048c1c6c32. Reason for revert: Fix available for deadlocks. Bug: 134244752 Change-Id: Ib65214598837289bd39dbf040b56ab7835f893ba
048c1c6c32