Automatic translation import

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