Merge "Remove unicode prefix from code"