Automatic translation import

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