Merge "Revert "Add vendor_property_type to vendor_default_prop""