Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""