Minimize usage of EntityContent / ECFactory

Change-Id: I33b0be329d0a490c6e049d44a6341607f95aaf9a
Merge "Minimize usage of EntityContent / ECFactory"