Merge "Fixes InCallControllerTests failure" into oc-dev