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

Change-Id: Ibf8cba94e6ba386f57e5b1967bbb539c2d665f4d