Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev