Get rid of use of EntityContentFactory singleton

Change-Id: I9f0a0144e1d3187474814dfbf8b5833057dac88d