Merge "init: always expand args in subcontext"
am: c64c006991

Change-Id: Ib7fcf2c8ecebf13ffaff6458d05147bbf45541ce