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

Change-Id: I20ae335fec3d0837bdbbe524b8a6576560dff948