Merge "Use correct external storage directory" into jb-mr1-dev