Settings: Minor values cleanup

Change-Id: If26d98b947b36bea19715f644e3e6308c0581121
Minor grammar nit-picking

Change-Id: I5b0a1921a343d9615e36b2524d90da5295dd2b3f
Merge "Settings: Minor values cleanup" into cm-10.2
Merge "Minor grammar nit-picking" into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2