Base: CS Translation

Change-Id: I3fe100cc3d215e425c41dea7ba7f14c6f40677d5
Merge "Base: CS Translation" into android-4.4