Return an EntityIdValue in EntityIdValueParser

Change-Id: If287ac8911558d8d521238f6a7e233c6fd6f4766
Merge "Return an EntityIdValue in EntityIdValueParser"