Automatic translation import

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