am 42a1e6c9: Merge "Iteration on multi-user external storage." into jb-mr1-dev

* commit '42a1e6c9d827fc3d64ad3b0750b87de1f4c436e7':
  Iteration on multi-user external storage.