Automatic translation import

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