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

Change-Id: I562d141337ea6b72b8d6f584ae27fac7ace8b8c0