Merge "Add deprecation notice to Linkify MAP_ADDRESSES" into pi-dev
am: 28709538fe

Change-Id: I8126326e8a62a38ebfdadf5955ae3e63468216fc