Merge "Environment: Fix default mount point for external storage"