Deprecate EntityFactory

Change-Id: I87884343bd5abb07601c02120fdd9fb158d4e2a1