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

Change-Id: I0104d99159302c0a3197ea106f0db4675c5ef1ee