am 23cd918a: am 23746be0: Merge "Reorganizing permissions into groups oriented...
am 23cd918a: am 23746be0: Merge "Reorganizing permissions into groups oriented around user-understandable concepts." into jb-dev
* commit '23cd918a':
Reorganizing permissions into groups oriented around user-understandable concepts.