String edits to bring to standards.
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328

Change-Id: I6dbe1ea100397e4cfa98997928ff1662728b6e9c
1 file changed