am 4c034dab: Merge "adjust sdcard dir" into jb-mr1-dev

* commit '4c034dab3d644caecd7941cda501f49ab46862eb':
  adjust sdcard dir