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

Change-Id: Ib8ea5db8384d0c186f6c73a860858177ddc804be