Merge "Don't give drmserver read permission to local storage" into jb-mr1-dev