This reverts commit 6d43a861. (cherry picked from commit 0f2ded62) Test: m Test: Device boots Change-Id: I627e47c6ead4ce2d2bffa923a32a56d06c022df7