Remove one more usage of EntityId::newFromPrefixedId

Change-Id: I89f86a52476e157cfe69424aa8417474ba9fbf8d
Merge "Remove one more usage of EntityId::newFromPrefixedId"