Merge "Revert "Refactor argument creation to be before the fork""
am: 13ad9e8904

Change-Id: I8434909eaa2ae6b416992545eeaf10f856c087bd