This reverts commit 432fbfa8. Reason for revert: Reland Test: device boots Change-Id: I95e2ae124c6d4a74ca5303f898583de992b15cbd