Merge "Merge "Remove unused methods from LinkProperties." am: ec3a0131b9 am: cc7d3d97f3 am: b4f637d300 am: c7c6d5ab55" into mainline-prod