Merge "Final cleanups to permission slices" into pi-dev