Merge "Extend white-listed directories to include /mnt/expand"