Merge "Make LinkifyTest#testAddLinks7 more realistic" into lmp-dev