Automatic translation import

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