Automatic translation import

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