Merge "Switch to use commandline parser" am: fd27983b62
am: 188b4ec273

Change-Id: I29a73a007ea5cc75333b0733b71b71cddb0e029d