Remove all use of deprecated getIdFormatter

Change-Id: I9fdff6e98262a55a0d96409803eac2430632e396
Remove deprected unused getEntityIdFormatter

Change-Id: Iffd69e2b78f8fdda2e172b183262e8f716aed88f
Merge "Remove all use of deprecated getIdFormatter"
Merge "Remove deprected unused getEntityIdFormatter"