This reverts commit c3648a82f1.
Reason for revert: will cause lock contention
Bug: 139521784
Test: build pass
Change-Id: Ic10951493ec8dda4e5a5adcbd1c3cb3be3b64782
This reverts commit c3648a82f1.
Reason for revert: will cause lock contention
Bug: 139521784
Test: build pass
Change-Id: Ic10951493ec8dda4e5a5adcbd1c3cb3be3b64782