Merge "[dice] Adapt dice service and tests to the new DiceArtifacts trait"