am cd90d42d: am 017c6f2d: Merge "Fire onConferenceChanged after reseting...
am cd90d42d: am 017c6f2d: Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev
automerge: aec33e66
* commit 'aec33e66':
Fire onConferenceChanged after reseting conference.