Fix problems with strings.

bug:3147981
Change-Id: Ie54f7934c632a0d15ef5645dfa544b2ea2f2fcab
22 files changed