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

Change-Id: Icf661dcc0ff88e43ab28a84ace6bfa61e411e154