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

Change-Id: Ifdb8d967c0f80838e378748e6f80ff6272663293