Automatic translation import

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