Merge "Refine the DSU SD card support"