Merge "Remove old compatibility layer for old ImsService Impls"