Merge Translations with CM

Change-Id: I0510c27a22a8fef995acc5f875655de383de2477