Fix up arg parsing. am: b21d771cf5
am: f9bee242d1

Change-Id: I1ec9274f9dd3ebf58a7627e2e9fe507f2fd5dbb3