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

* commit 'b0d56eef7b073461678751f56e24623f2e1ab581':
  Multi-user external storage support.