Merge "Fix for arabic crash" into ics-mr1