String improvements.

Change-Id: I9ded94b63ea146745e815f6b5e69b0904c6b10f7