Fix 2.6 unicode test failures

Change-Id: I8da0b7f65eeb8482a10ddcfa66db77138a45398b
testing

Change-Id: I996a9a0e9e8301fa177d019bcde0e7fda5dcebfc