Merge CM upstream translation

Change-Id: Id81e1b4de93f1735d4822bd5d566f3ddadb746bd