This reverts commit 3623f3219e.
Reason for revert: 40% startup perf regression
Test: revert
Bug 132129453
Exempt-From-Owner-Approval: critical revert
Change-Id: I19dc33e6a71c9254b4096154f4089c059fe408dd
This reverts commit 3623f3219e.
Reason for revert: 40% startup perf regression
Test: revert
Bug 132129453
Exempt-From-Owner-Approval: critical revert
Change-Id: I19dc33e6a71c9254b4096154f4089c059fe408dd