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

Change-Id: I7035d572fe1055bc3a98ee8c8ba1da057918525e