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

Change-Id: I197cff7512075e10fdd2cd60ffc50da4efac9d7b