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

Change-Id: I1b813979105ee609daf5c9a6d48b127dd71c8050