Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev