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

Change-Id: I708fb6b43565da96e81d76243272b7c292e81d74