Merge "Revert "New protocol for property_service""