Merge "Correctly compare strings in UTF-8 instead of UTF-16 Bug #3272858"