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

Change-Id: I16e0a8a58b38593e6e6f827d2a0814e05210b765