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
automerge: 736cb492
* commit '736cb492':
Fixing conference merge where only one party is added to conference.