Adapt to changes of the IEntityManager interface.

Change-Id: I4ec7cebbc29f413f604f7addb18d2e531d66e3a6