Merge "Remove ICallCommandService and ICallHandlerService"