This patch makes some general cleanup changes to help strings to tidy up various areas of the code. No functional impacts result from the changes within this patch. Closes-Bug: #1477837 Change-Id: I25a81059e974ac0083bb439f1cd37fb82157b3bb