Settings: Update strings

Change-Id: Ia48ea0db5fe590f90d69114c0e1acddb5f9ab21a
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0