Automatic translation import

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