Merge "Clean up: use ScopedUtfChars for consistency"