Get rid of old EntityId Usage

Change-Id: Ic58a4d88531adb18830158d12a40373af72b26bb
Merge "Get rid of old EntityId Usage"