am ba82fe49: am 1601772b: Merge "Fixing conference merge where only one party...
am ba82fe49: am 1601772b: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
* commit 'ba82fe49':
Fixing conference merge where only one party is added to conference.