Settings: Fix for Transifex

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