Merge "Include user identifier in external storage paths." into jb-mr1-dev