Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev
am: 9107b53c6d

Change-Id: I392e8d905457bcd11a7d83bc330d992636e9e407