resolve merge conflicts of 9887f2f5 to lmp-sprout-dev. am: 5a776514 am:...

resolve merge conflicts of 9887f2f5 to lmp-sprout-dev. am: 5a776514 am: 5946a9b7 am: 2ecc918b am: 81674b1f am: 1e04dfb9 am: 3927089c am: f1530bf3
am: fba515f6

* commit 'fba515f6':
  Protect some new broadcasts.