Merge "init: remove the restriction of arguments" am: 2f171cc69e
am: 89c8a697b9

Change-Id: I002f6112bd4b18f9f6f90bf69bc51ca02af054b4