Merge "Abbreviate permission labels less aggressively" into pi-dev
am: af76df93e3

Change-Id: Ic78313f9bf162478b76ef35028659a1c93c9c58d