Merge "Ensure /data/media before trying to upgrade." into jb-mr1-dev