Merge "CallFeaturesSettingTest: Solves failing test case" am: 6f51c6caa1 am: ddea30cf66 am: d5e75d173c
am: b4c261766d

Change-Id: If812b57e5551ba9e7d62c586ccc273771c6939a5