Remove all use of deprecated getEntityIdFormatter

Change-Id: I8998331b9e7412596f55f4a2f63e6a3d562732bf
Merge "Remove all use of deprecated getEntityIdFormatter"