Merge "Check vendor_property_contexts namespaces"