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

Change-Id: I752934e23056eb638981f9d9a63e2a023b67d98d