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

Change-Id: Ie8d95fcbbe3df8eee77221a62c42dc39ee7a0f4a