Merge "Key Conference Participants by User and Endpoint Uris" into nyc-mr1-dev am: a942867de8
am: 79d11dde1e

Change-Id: Ic1c32145f5e0e2afe9100179c0c88508b2aa9045