Merge "property_service: drop unused header"