Merge "Refactor argument creation to be before the fork" am: bb22780922 am: d84d3a3612
am: e2849eb449

Change-Id: I556079205eeb5f871917ad7f6d1fea16f652d9ac