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

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