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

Change-Id: I3256c8ca665ede11bab55072cddb8598c1d3b51b