Merge "Base: CS translation" into cm-10.1

Change-Id: Icc203ac5b9b38cde2a86944201fc9532b60ae6c2