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

Change-Id: Ibfe4469958117c99f331ddb6ff6eca3f46c05bde