Fix the rest of Settings FCs

Change-Id: Ic051c2970d27263bbb0f32214f7fc499e8fad0bd