Merge "Execute non-optimized add operations one at a time." into nyc-support-25.1-dev
am: bb4139326b

Change-Id: I782431fa670078a3878c5304fe41924afab0e124