Automatic translation import

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