Merge "Add support for emulating external storage on devices with no SD card"