Merge "Multi-user external storage support." into jb-mr1-dev