Remove unnecessary usage of EntityIdFormatter in lib

Change-Id: Ie328494ee4848ce69b8a9be3374614c1fd4923eb
Merge "Remove unnecessary usage of EntityIdFormatter in lib"