Initial translation import

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