2nd-init: WIP update for 4.3

Change-Id: Ib17835f24fa49d9fe86ce08751bc2516a33c8b58