Merge "Remove RRO policy product_services"