Merge "Merge "Fix email auto link when there are two chars in local part" into oc-mr1-dev am: 3b0fd066f1 am: f72d320add"