Merge "bug:3276501 set CHAR_LIMIT for i18n purposes" into honeycomb