Automatic translation import

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