Fix argv handling am: b341a3bbf9 am: 209b582597

Change-Id: I0baf2e09a1238408d1039920a62f770264f4e81f