Consolidate EntityIdLookup with PageEntityIdLookup

Change-Id: I25b9b82c37093297753271f4f9b02317451fda52
Merge "Consolidate EntityIdLookup with PageEntityIdLookup"