am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""

# Via Gerrit Code Review
* commit '9f03d4f921fab5757a791653891ce73c2d006e20':
  Revert "use utf8_length() instead of local function, isValidUtf8()"