am 235f60bc: am 4143b796: Merge "Fixing conference merge where only one party...
am 235f60bc: am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
* commit '235f60bc':
Fixing conference merge where only one party is added to conference.