Automatic translation import

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