Settings: Fix camel case

Change-Id: Ibc74affb90757f0680e9ce2aa15bc9c4596ec28b
Merge branch 'cm-11.0' into kk_mkt