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

* changes:
  [automerge] Fix OOB read for registerLocaleList 2p: fde7f4a25c
  Fix OOB read for registerLocaleList