getInternalIdForEntity now takes an EntityId rather than its components

Change-Id: I2a176114eeb68bb4f3e986d81ebc748f7a651bbc
Merge "getInternalIdForEntity now takes an EntityId rather than its components"