Automatic translation import

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