Merge "Merge "Remove unused methods from LinkProperties." am: ec3a0131 am: cc7d3d97 am: b4f637d3 am: c7c6d5ab" into mainline-prod