Merge "Remove vendor_availble of propertyinfoserializer"