Merge "Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4 am: b825c71446 am: ad7fe271ae" into nyc-mr2-dev-plus-aosp