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

Change-Id: I13759f9946c44e5c62c8b93d9458538cb650a410

Additional string cleanup.
1 file changed