Merge "Rename the source of v4 (combined legacy) module to v4" into nyc-support-24.1-dev