am da9754e8: Merge "Fix issue #6860828 Non-root shell can\'t grant permissions" into jb-dev

* commit 'da9754e883cd7b738da9cc6ec4bb1c5b6c5b8d93':
  Fix issue #6860828 Non-root shell can't grant permissions