Merge "Fix sorted list batched callback." into nyc-support-24.1-dev
am: 758b21c884

Change-Id: Ib286792443192bd80220bdd125bc4cc34a7e60b0