Bug: N/A Test: builds Change-Id: Ic5e2b9206bcfcb53c774989013b5db6aab462e42
Also move init over to it. Bug: http://b/37991155 Test: builds+boots Change-Id: I5113a9d96a5ce0a0f3bad71134d6cc4f7b41a57e