am 8ccaed6a: Merge "Don\'t give drmserver read permission to local storage" into jb-mr1-dev

* commit '8ccaed6a29d7371f614e94f28b68e476064fc959':
  Don't give drmserver read permission to local storage