Remove use of idFormatter in EntityContentFactory

Change-Id: Iad60185cfb72cfdc936fa0a9635d649dc672c22c
Merge "Remove use of idFormatter in EntityContentFactory"