Automatic translation import

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