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

Change-Id: I264a589322b87b09a5d250f1a7e71b7f1795f3dd