This reverts commit9863ba9f09. Reason for revert: Fix available for deadlocks. Bug: 113122541 Bug: 134244752 Merged-In: Ib65214598837289bd39dbf040b56ab7835f893ba Change-Id: Ia90bf2c72ef686e80800d113d03548e0efcadb66 (cherry picked from commitb393d28d65)