Merge "Disallow vendor_init from accessing core_data_file_type"