Merge "IMS Conference fixes related to RemoteConnectionServices." am: 91b31579bd
am: 98702a7396

Change-Id: I079d90c14dd62b5f6bac08a29ad3cac9e60158de