Remove last usages of EntityId::newFromPrefixedId from Lib

Change-Id: I03d0616dee5ab36e28987c808206cf4885aabc62