Merge "Send broadcasts as Shell." into nyc-dev
am: c30e3e7c09

* commit 'c30e3e7c095603c3c48b3c2691db80fec570c731':
  Send broadcasts as Shell.