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

Change-Id: I1fc7cecd154e4151792c90ada582f19aec53b2a1