Merge "Protect slice permissions text" into pi-dev
am: e791b67448

Change-Id: If65f285e9525b9f5b5212e3fede65ef4d378c312