Merge "init: remove superfluous forward definitions" am: deb23ba2c1 am: 256c8f5076
am: 856441d07f

Change-Id: I6f3a642497d549a766146dfbb9b0cf72497ed85f