Merge "Fix permissions on cloned data dirs" into jb-mr1-dev