Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread