This reverts commit e9eb96b0. Reason for revert: Wrong branch! Bug: 151758678 Test: build, boot Change-Id: I1fee6d58bf520e173ab9f45c97baee4c2a626b1a