Merge changes from topic "am-176ca6f66c0442f4b377ad1745278202" into main

* changes:
  [automerger skipped] Merge changes from topic "am-154b2a8fe9ea4681a4ac0d29cc4a2d11" into udc-d1-dev-plus-aosp am: cf0ab32c -s ours am: 5d2f2cb0 -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: 2e74a847 -s ours am: a36b4b4b -s ours am: 202bbc75 -s ours am: 9d82e993 -s ours am: 64a914a2 -s ours