Fix dumb bug merging receivers for multiple users.

Also clean up some debug output.

Change-Id: Ib19e47682e9ddfc6a234bd61d054275a362d28cc
2 files changed