This reverts commit b00eb645. Reason for revert: Boot issues after OTA Bug: 76228188 Fixes: 77888575 Change-Id: I5ca2605cb6befea46ce50198bc72bdd4b6e84f1a