This reverts commit 243e7ea1. Reason for revert: b/141854898 Exempt-From-Owner-Approval: Revert for failure to boot Change-Id: Id6812e5ecf7d88504706b2c4110d83f1034ab85c