Initial translation import

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