Merge "Fixes InCallControllerTests failure" into oc-dev am: 85182d30c3
am: 9980350a10

Change-Id: Ib0781051256fd4e3fb9712cdb2f6dc9537b18548