Remove last usages of EntityId::newFromPrefixedId from Repo

Change-Id: I15b080a46202045d690840547298a1649d98706a
Merge "Remove last usages of EntityId::newFromPrefixedId from Repo"