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

Change-Id: Ia50e912f45480ab19e5f720cd0fe6c0344521bf3