Merge "Clarify problems with Linkify.MAP_ADDRESSES." into qt-dev am: a0d66cf3f6
am: a50d608b89

Change-Id: I39201f82fe65b244a7b96bb9c329109f90f28edb