Remove old EntityId usage from api/getclaims

Change-Id: Iaf419c59032a15b97868c611489a4ed479f7a5ec
Merge "Remove old EntityId usage from api/getclaims"