Merge "Renames nonplat_property_contexts to vendor_property_contexts"