Merge "Optimize slice permission checks a bit" into pi-dev
am: a828705fc9

Change-Id: I190ce1596596946f45ead7c8f3b325c1d16eeb3c