Remove old EntityId usage from api/getentities

Change-Id: Iad26f6028fca6aea86ae5a3517c5a84789e2f5fa
Merge "Remove old EntityId usage from api/getentities"