String improvements.

Change-Id: I6d5ed4c5a983e821f32a0655afe820c5b249e432
Merge "String improvements." into cm-11.0