Merge "Allow tee to access mnt_vendor_file"