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