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

Change-Id: I8cbf5892c0e8df3562263b4022e584459bd23525