Merge \\"Key the conference participants using the Endpoint\\" into nyc-mr1-dev am: d74916ea4b
am: 554ed40683

Change-Id: I81ae681d5ee6d63062fc2b3e03b21eb97e83f015