Merge "Fix for unexpected IllegalArgumentException in ListRowDataAdapter." into nyc-support-25.1-dev