Merge "init: small header clean up" am: 9b33cbc0cb
am: d7d98803b2

Change-Id: Ic89a48fde921edd7726d8d95076a64f1b60195a4