2e06c6008e
This reverts commit 8cb3e6aac93147287bcb9fa41a284b1745d47c75. Reason for revert: boot time regression Change-Id: I5e6dc8e80d33256cf7dd8c0d5f1415373fba9048