Merge changes from topic "am-f3192916ce304a6db8e8f3e475d3060d" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into rvc-dev am: 60529947 am: 43304556 -s ours am: d2a0328e -s ours am: 5cb0cf9b -s ours am: 4f322f25 -s ours am: a8ccab0e -s ours am: 639c4e63 -s ours am: 0742cc0a -s ours am: 97628d54 -s ours am: 6f774749 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 62b37ab2 am: d6e366e2 -s ours am: 436b2ec7 -s ours am: 6f4389a1 -s ours am: 0eee64f8 -s ours am: 9c084b4a -s ours am: bbd02969 -s ours am: a95ba0b0 -s ours am: ebfaa1f9 -s ours am: 3d6d5fe8 -s ours