Merge "Revert "Revert "Ensure necessary external storage dirs while creating sandboxes."""