Merge "init: fix typo" am: 15a14d1ad9
am: 00a15fc9bf

Change-Id: I9aa06a67b378c1fa0b394f6ea2b924b32476a504