Fixes in Strings.

Change-Id: If5deaeb43cd215d363b06bba67d3f1150eef4b4a