Automatic translation import

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