Merge changes from topic "presubmit-am-e0844d7b1c6e4448bb8524d03efb5eec" into sc-qpr1-dev

* changes:
  [automerge] Add missing bounds checks 2p: 2ebfe99b3a
  Add missing bounds checks