Merge "Iteration on multi-user external storage." into jb-mr1-dev