Merge "Settings: CS translation" into cm-10.1

Change-Id: I19b67b10bd7964802e2f5df9f35437d5c3081160