Merge changes from topic "presubmit-am-ac1fefcfb8ff4afa9a12b9c99a31f5fa" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Limit broadcast by user 2p: 89f6161d7a
  Limit broadcast by user