Merge "Settings: CS AOSP translation" into cm-10.1