Automatic translation import

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