This reverts commit 1214c878. Test: boot device Bug: 72270082 Bug: 68751119 Change-Id: I7d0e709a04ffeb8b877aef539a978ee251a75742