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

Change-Id: I2248723dfc7ce7c1488b58c6907b23bf3c713ee7