Merge "Update char limit for i18n" into udc-dev