Prevent unnecessary extra batch, and add a 'continueFrom' helper for BATCH_LAST_ID GitOrigin-RevId: d6832c40bbed2c27676f4b72d720938707847bfc