Merge "Harden /mnt/pass_through paths"