Pull down deprecated implementation in getEntityId

Change-Id: I2a4c3c147eb15d7c9eb6e64de5e2580fd67255f9
Merge "Pull down deprecated implementation in getEntityId"