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