Merge "Revert "Update long strings to provide users with more information about permissions."" into jb-dev