Merge "Remove product_services rules if it's merged away"