Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"