Cleanup in WikiPageEntityLookup

Change-Id: I5a8489ca8fd88d8d337bae11ece15ed9d601ebf6
Merge "Cleanup in WikiPageEntityLookup"