Merge "Use a plain String instead of CharArrayBuffer." into ics-mr1