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

Change-Id: Ia9c85bc3049ba5d40b5cbbfb9b3d576d98ceecc4