Merge "Replace CallServiceSelectors with Subscriptions (1/3)"