Automatic translation import

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