Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
am: 3c33d2b997

Change-Id: I5afdd7f0a7e00de6305b3a930bf432a351df8d7b