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

Change-Id: I3df99a1b6faa66dce92b4a41da564fd9a45bd771