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

* commit '86e21a1d24154890fa8e48a9eb2b541eb13fc079':
  Don't give drmserver read permission to local storage