Merge "init: fix variable scope issue with ExpandArgs()" am: 1973110355
am: 698981df84

Change-Id: I02cad02e47b87e7560596545b597d3cbb93dc390