Automatic translation import

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