Merge "Add CHAR LIMIT to string resources" into honeycomb