Automatic translation import

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