Updated entity id parser implementation

Entity id parser will now parse considering a prefix map.

Change-Id: I1cae4b3982b2ab122695632b46cb174a55a3c508
Merge "Updated entity id parser implementation"