Automatic translation import

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