Remove OPT_PREFIX_MAP from EntityIdParser

Change-Id: Id3f505a368f0962816d3a61fc538f60f33fb80fe
Merge "Remove OPT_PREFIX_MAP from EntityIdParser"