Merge "Put a handle on the String object." am: fbcf46e35e
am: df0c3eff83

* commit 'df0c3eff83b65259fff28aa1e1d9e71c22cf40f9':
  Put a handle on the String object.

Change-Id: Iffe67f734ba07813254b34d255102dc815690e6a