Automatic translation import

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