Automatic translation import

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