Merge "init: clean up more headers" am: 4f6feec25b
am: a7d0718907

Change-Id: Id81a849349179715102d7d5956c67475ba0263b0