Merge "init: fix typo" am: 15a14d1ad9 am: 00a15fc9bf am: 707a5ad27a
am: 242f47d544

Change-Id: Ifedfc29e3a5713754fd92e98957fcf7870c56a37