This reverts commit 942500b9. Bug: 75287236 Test: boot a device Merged-In: If81a2d2a46979ffbd536bb95528c3b4ebe3483df Change-Id: If81a2d2a46979ffbd536bb95528c3b4ebe3483df (cherry picked from commit a6d9d6b6)