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