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

Change-Id: I61a45dd4489c930f2c5b3fbcf6f7632771d6f18e