Merge changes from topic "am-6b0a2309fa4b41fda4e5f5ffa929a42b" into main

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Ignore test on old branch." into sc-dev am: ab3ebefd am: 2c94a7e2 -s ours am: 4b733e1a -s ours am: 825cb905 -s ours am: 7b5114d0 -s ours am: c9fb07bd -s ours am: c2017a02 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Ignore test on old branch. am: 838a4d8a am: 4974d93e -s ours am: dc520f2e -s ours am: 513518c5 -s ours am: 1499fcf6 -s ours am: 0681f191 -s ours am: 0879cf8e -s ours