Remove old EntityId usage from api/linktitles

Change-Id: I1835e0caf3f1a0b778a19ee59f6f8c72cd010002
Merge "Remove old EntityId usage from api/linktitles"