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

Change-Id: Ib3910f93bc872e1bf2d059092173aebac935271f