Fix typos in comments and help strings

Change-Id: I68446dd652186191d19551032a634aee03f9e637
Merge "Fix typos in comments and help strings"