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