Automatic translation import

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