Add FIXME to EntityPerPageTable

Change-Id: Ifaa7e4b784299504f8a54caecec41a18df3f8e4c
Merge "Add FIXME to EntityPerPageTable"