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

Change-Id: If660b6763371da2d7eaf08f9e2d36df9ce088832