Merge "Add @utf8InCpp to String fields"