am 2be5338a: Merge "Multi-user external storage support." into jb-mr1-dev

* commit '2be5338a84f19b24b6515c0bfcf2f3f7b55262c1':
  Multi-user external storage support.