Make the help strings constant

Have all the option help strinsg match the usage text for that command.

Change-Id: I575a71769600f95c33cc4bbc9904b313f890e997
Merge "Make the help strings constant"