This reverts commit ae6d8a3e. Bug: 130669566 Test: build, boot Change-Id: Icdb3b1e0534233995d5c0594feede6261033ec45