Merge "adjust sdcard dir" into jb-mr1-dev