Automatic translation import

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