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

Change-Id: I641fb48c2f67d5efa2f73383f7ce38cc34676b51