Settings: Remove redundant lines

Change-Id: I8f049386a6860bb3990fb56013beb9c9022b8bd7
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
Merge conflicts

Change-Id: I7203c8c26c78bbe6c64d8d5f8e2124f97bd540de
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7