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