am f38bfacc: Merge "String cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"

* commit 'f38bfacc8df350c6152d06a09234d5af459c994f':
  String cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328