Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev