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

Change-Id: Iceb621c4768e4d5447c8f7f9c60eb9d5fe0cff1e