Merge "Remove old hacks in StringUtils::isUtf8()"