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

Change-Id: I4b5af94ddc84fd7c49b13bc6e072f4cba345d882