Merge "sdcard: Fix bad merge"