Fix 2.6 unicode test failures

Change-Id: I8da0b7f65eeb8482a10ddcfa66db77138a45398b