am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev

* commit '2278898126c1cea4bd345bb96313d381b4ad3993':
  System server should always send broadcasts to a specific or all users