Merge "Checking in API diffs for 25.4.0" into nyc-support-25.4-dev