Merge "Fix test breakage due to external storage access"