Fix a few more unicode errors

Change-Id: I30531fdc5c268dac65327a1d704d17a40d84ab77
Merge "Fix a few more unicode errors"