fix large objects with unicode

Change-Id: I2a088e6cfe354d18cb2107a42bc626c2e7822e42
Merge "fix large objects with unicode"