Automatic translation import

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