Fixed Exception failures caused by i18n

Change-Id: If13bf9e91cbb8c7ba6cdb4df10c542af001054d2
Closes-bug: #1355065
Merge "Fixed Exception failures caused by i18n"