Revert "Revert "Revert "Use actual storage type of sdcard/usb (2/2)."""

This reverts commit 64a78196d34cb6c6f4ef3e60affa327d8b61f99a.