Remove old EntityId usage from api/ModifyClaim

Change-Id: I5cb0e6e9cf4372e5e07027b7c9744f67893bba6e
Merge "Remove old EntityId usage from api/ModifyClaim"