Merge "Slice permissions++" into pi-dev am: 964631d1a7
am: a68c3352f8

Change-Id: I63e8240c59aa8c5c2699cb9293a3a3030e24a0c7