Merge "Fix API-related 1.25 release notes"