Merge "Add auto-granting of slice permissions" into pi-dev
am: f778a91a88

Change-Id: Ia4a1f22daca16324c23e401df8bc674ddc33e3d1