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

Change-Id: I32c5f58a4bb7cbed6f6e8455f8d50b413ef3a4a3