Merge "Base: CS translation" into cm-10.1

Change-Id: I280da95734adf2de00d369255c5c12a60676fa5e