Merge "init: more header cleanup" am: ab5ab1ebd4
am: 6510908bd1

Change-Id: I4652593443b18e91914eda674276ad4b37f96eb9