This reverts commit 77ee6507. Reason for revert: Occasional deadlock b/72684251 Change-Id: I1eb02bf1fefcce66830e1e0ab34a813262ba40d6