Move ID assignment to EntityStore

Bug: 62493
Change-Id: I996e56d2f4c003b9232baed6a5af1716dddbf677
Merge "Move ID assignment to EntityStore"