Merge "init: clean up more headers" am: 4f6feec25b am: a7d0718907 am: 99b26e5ab1
am: 7dd593a887

Change-Id: Ia909afc584ce37ff8859c3fe2d4f0b3ee6aa33f6