Merge "Fix 'UnicodeEncodeError' for unicode values"