am 472cd638: Merge "String scrub to bring to punc, wording, etc. standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"

* commit '472cd63868616bf3a8493484794356a1616a22c6':
  String scrub to bring to punc, wording, etc. standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328