Automatic translation import

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