Merge changes from topic "am-0d8057e4fd58491aa2ad8537f650318b" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into rvc-qpr-dev am: fc881f5dea -s ours am: 9b791f0b6c -s ours am: 15c48d5457 -s ours am: 5ca3ba7c7c -s ours am: e69d9c81fe -s ours am: 0ccd546658 -s ours am: 5e3b1152e1 -s ours am: 9c02668abf -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 68686110b8 -s ours am: 6006ebee56 -s ours am: dc69ac89e7 -s ours am: 01b73e7960 -s ours am: 1e0028e9f6 -s ours am: 5691035b5a -s ours am: a66123bf8f -s ours am: c43898eace -s ours