Automatic translation import

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