Merge "Reorganizing permissions into groups oriented around user-understandable concepts." into jb-dev