Automatic translation import

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