Remove old EntityId usage from api/ModifyEntity

Change-Id: I9103185827944125d6b8a0de7640db3d0794692d
Merge "Remove old EntityId usage from api/ModifyEntity"