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

Change-Id: I48997d470159562be5b8bcf5423d4acbfa2f98ed