Automatic translation import

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