Merge "Update the short strings associatd with permissions to improve readability." into jb-dev