Merge "Refactor argument creation to be before the fork" am: bb22780922
am: d84d3a3612

Change-Id: I67de8cf8aae9e54b2601b2af931c1d509b5a4842