Merge "Revert "Prefer ScopedUtfChars where possible""