Merge "Converting EXTRA_PACKAGE_NAME to a link tag"