Merge "grantPermissionsLPw: get rid of a level of curly braces" into jb-mr2-dev