am 84af796b: Merge "Fix for arabic crash" into ics-mr1

* commit '84af796b8a6eaba851c6af2922500ad1bc49a34b':
  Fix for arabic crash