Merge "init: fix variable scope issue with ExpandArgs()" into oc-mr1-dev am: ece234f9ac  -s ours
am: 988220c73c

Change-Id: I69dbaefe984480b9dc79fabeb13b03ff24c73c10