Merge "Make connection events work for conferences" am: 2476853318
am: 497f8a677f

Change-Id: I29bf731aaf8afdd81b99f5125dc09e8183812ef8