Normalize more help strings

Change-Id: I2b21bc904e35c1cc50da369d148e607fe3e8cf90
Merge "Normalize more help strings"