Merge "Avoid going over max service name length when renaming NSD services"