Merge "Base: CS translation" into cm-10.1

Change-Id: I08632481d1857151aeb216fc9c30f13d7771290f