Merge "init: more header cleanup" am: ab5ab1ebd4 am: 6510908bd1 am: d93ffe7260
am: 25c351ccb8

Change-Id: I84b531c60d5ef9b0d63591c38ad183876d4b5674