Merge "Fix email auto link when there are two chars in local part" into oc-mr1-dev