Settings: Fix the failing strings

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