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

* commit 'b0eda792097d7091288b2428b958a9a29eb58340':
  More protected broadcasts!