Merge "callForwarding: Add service class"