Merge "send broadcast to the right users" into oc-dev
am: 4a30689414

Change-Id: I25077adff02d451493f487432a174aa3fbbff2d8