Merge "Remove CHAR LIMIT from string to fix build." into gingerbread