Improved handling for chars with umlauts, and encodings like UTF-8 & UTF-16

Change-Id: I84b96e2fd5aa21989aa02001d5936927d2ae00e9
Merge "Improved handling for chars with umlauts, and encodings like UTF-8 & UTF-16"