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

Change-Id: Ica5633fe06f699360bac047ccaca6fb2d6fb638b