Automatic translation import

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