Merge "init: fix format issue" am: f95338f634 am: a1051005a9 am: 2c486f593c am: 0b64da19c3
am: b6b5d6cc8c

Change-Id: I9675ffc579fd151c5071a44ab7aecd98b2caa092