Merge "Final cleanups to permission slices" into pi-dev am: 64a33d695d
am: 3f3f1ebc17

Change-Id: I075703514267496004435b984733133c3a8887bf