Merge "Revert "property_context: split into platform and non-platform components.""