Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev am: ae42e1d0c2
am: 67e71049b1

Change-Id: Idaa30c93f338228a19e8deb9852274e5e518fd18