Merge changes from topic "presubmit-am-836e4405ee234d149e41027dcbd9bc29" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Update correct max block counts 2p: 1012636603
  Update correct max block counts