Merge "Base-Core: CS translation" into cm-10.1

Change-Id: I65e46f2e58eafbeeceeb53e0edde46620f12d928