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