Merge "Fix mocked InCallService in unit tests."