am 2fefd7ac: am d4340f89: Merge "Change Connections to allow setting...
am 2fefd7ac: am d4340f89: Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev automerge: ce5a8e86
* commit '2fefd7ac':
Change Connections to allow setting conferenceable with conferences.