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

Change-Id: I62d19f8801886164e281da42556c9206b6dc9adf