Merge "Revert "Revert "Refactor argument creation to be before the fork""" am: 94d4364d94 am: bfd7e73db2
am: fe2b7f9ba3

Change-Id: I5e23f3971004d19a40a360f315789a656e233cec