Automatic translation import

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