fix where we get the EntityIdParser from.

Change-Id: I020d23b81e351e12811c2830d7292fb0b0ec44fb
Merge "fix where we get the EntityIdParser from."