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

Change-Id: Ifb56bd57e49406a4ffe251067e1be46518ead8f9