Merge \"Fix issue where multiple anonymous participants don\'t show up correctly.\" into nyc-mr1-dev
am: d9629dfb38

Change-Id: I5dbb3979d6fff38d26e671bcf852fdf27176a8c3