Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread