Merge "Stop manually messing with argv" am: 5b9fd40b70 am: 44329cbdc4
am: 56aacc2105

Change-Id: I5878f80cd37d510b5539fb1abb393e77b334b6a9