Merge "Add expandattribute to system_and_vendor_property_type"