Merge \"Rename the source of v4 (combined legacy) module to v4\" into nyc-support-24.1-dev
am: 69ee83b8c4

Change-Id: I1da7d22e4da05f1a83660483a3fbdd24704194a5