Parse EntityIds via API

Change-Id: I6fe341c6e7aa4a06e19a8648be00c943ae35e09e
Merge "Parse EntityIds via API"