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

Change-Id: Iff68e4397ede45f7836ae096459765e13f982754