Specify options for entityidparser that have all required fields set

Change-Id: I5994897f3c5c2ab31eb276f79370e1d509bf0e8f
Merge "Specify options for entityidparser that have all required fields set"