Merge changes from topic "am-335e76218399421fb8d1c870e2b623c9" into main

* changes:
  [automerger skipped] Merge changes from topic "am-53a777bd7e4e44da8f96a18f5a2dd4fb" into udc-d1-dev-plus-aosp am: 09fcad30 -s ours am: 59701e0b -s ours
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into sc-dev am: 976b1f8c -s ours am: 2bfd26b2 -s ours am: 99114aeb -s ours am: 2fe19fd3 -s ours am: 235a44e8 -s ours am: 23f1d3e3 -s ours am: 5c89651c -s ours am: 58ca058d -s ours am: 246808e2 -s ours am: 58bfabea -s ours