Merge "Adjust owners for incremental NsdManager changes" into main