Automatic translation import

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