Automatic translation import

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