Merge remote-tracking branch 'goog/nyc-support-25.3-dev' into ffwd_nyc-support-25.4-dev

Change-Id: If8a680359fd9c145c1dba7adf4fe258fa0b40045