[automerger skipped] Port in minimal changes to support BroadcastSub and...
[automerger skipped] Port in minimal changes to support BroadcastSub and BroadcastDiv am: 55302b51 am: 97595de6 -s ours
am: f659a332 -s ours
Change-Id: I4a95454d97a5a7a0413e2dedd83cce4a2819ed99