Automatic translation import

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