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

Change-Id: Ibfc388547a7ea7b23c492bb9ca93697843658315