Merge "Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549 am: b825c714 am: db8fdee7" into nyc-mr2-dev-plus-aosp