Fix help message, man page. am: 959f656840 am: 286c6909cf
am: ac3f385b1f

Change-Id: I9e98e03ac4788b49fdaba43680da6fa5b5988e8e