Merge "IMS Conference fixes related to RemoteConnectionServices." into nyc-mr1-dev am: 6bd2b8b388 am: a2f5de28fb
am: a32c8e6876

Change-Id: Ib9bc88c126cee7eef35ef4871f524f8719f7453b