Merge "Use CollectionUtils for array concatenation in NsdService" into main