Merge "Remove redundant dependency" into nyc-support-25.3-dev