Revert "Linkify email addresses only."

This reverts commit da153fb1651c2f70fbb3a2f9930950faec8b798b.

Change-Id: I42f22742c77f559fadd2b54784b086dd521f7bdc
Merge remote-tracking branch 'cm/cm-11.0' into HEAD