Initial translation import

Change-Id: I140bad5576267cb2e997743982d3b93b49f09f2d
Merge branch 'cm' into HEAD