This reverts commit 7a2c7c2f. Reason for revert: Breaks boot in debug mode Bug: 119800099 Change-Id: I6d015b04c480f76824ead936238cbf49b164b7e3 Test: N/A