This reverts commit 2121fe04. Change-Id: If451a6a478be52043edbdea64db7208d0f9046d3 Bug: 117471712 Test: Device boots