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

Change-Id: I1229595b7106ea506b5624237eb13397e0a9a012