This reverts commit e78a9805. Reason for revert: boot time regression: b/289682906 Change-Id: I2cbae4c3b5210ea1827e02ff3357b3611d62b0eb