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