Merge "More protected broadcasts!" into nyc-dev
am: be3c6041ad

* commit 'be3c6041ad9a07822f0e83d60387b040eb569fdb':
  More protected broadcasts!