Merge "Added auto link support"
am: 824962e17c

Change-Id: Ibf7f01442b06f4c96cf2e2da060daf29bddec33b