am 92d7f9ff: Merge "Fix bug #6408393 Character corruption is caused when...
am 92d7f9ff: Merge "Fix bug #6408393 Character corruption is caused when locale is changed" into jb-dev
* commit '92d7f9ff':
Fix bug #6408393 Character corruption is caused when locale is changed